b96c30
@@ -607,6 +607,9 @@
public class AmqpAppender extends AppenderBase<ILoggingEvent> {
 				factoryBean.setTrustStoreType(this.trustStoreType);
 			}
 		}
+		if (this.layout == null) {
+			addError("A layout is required");
+		}
 	}
 
 	/**
@@ -745,6 +748,9 @@
public class AmqpAppender extends AppenderBase<ILoggingEvent> {
 								message = new Message(msgBody.getBytes(), amqpProps); //NOSONAR (default charset)
 							}
 						}
+						else {
+							message = new Message(msgBody.getBytes(), amqpProps); //NOSONAR (default charset)
+						}
 
 						message = postProcessMessageBeforeSend(message, event);
 						rabbitTemplate.send(AmqpAppender.this.exchangeName, routingKey, message);
